U.S.-Colombia showdown over deportation flights: What happened?

U.S.-Colombia showdown over deportation flights: What happened?